merge trunk
authorKenichi Handa <handa@gnu.org>
Fri, 14 Sep 2012 11:32:32 +0000 (20:32 +0900)
committerKenichi Handa <handa@gnu.org>
Fri, 14 Sep 2012 11:32:32 +0000 (20:32 +0900)
commitad2f7be0c316ca499079b98aa8701c788949e2c5
tree6381b85f0819bd5b157da408075970fd8311113c
parent306d64de5f29ba99294bf62255baeb0ae456e514
parent72c0d758e485a685c745fc02f91f03a882aad395
merge trunk